From: Ingo Molnar Date: Sat, 21 Nov 2009 12:57:35 +0000 (+0100) Subject: Merge branch 'perf/urgent' into perf/core X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~19810^2~270 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=7031281e02bf951a2259849217193fb9d75a9762;p=linux-4.9.git Merge branch 'perf/urgent' into perf/core Conflicts: tools/perf/util/symbol.c Merge reason: this fix will get merged in .33, not .32, plus resolve the conflict. Signed-off-by: Ingo Molnar --- 7031281e02bf951a2259849217193fb9d75a9762